Release 10.6 final integration #6331

ana-pantilie · 2025-09-25T09:55:22Z

Description

Add your description here, if it fixes a particular issue please provide a
link
to the issue.

Checklist

Commit sequence broadly makes sense and commits have useful messages
New tests are added if needed and existing tests are updated. These may include:
- golden tests
- property tests
- roundtrip tests
- integration tests
  See Runnings tests for more details
Any changes are noted in the CHANGELOG.md for affected package
The version bounds in .cabal files are updated
CI passes. See note on CI. The following CI checks are required:
- Code is linted with hlint. See .github/workflows/check-hlint.yml to get the hlint version
- Code is formatted with stylish-haskell. See .github/workflows/stylish-haskell.yml to get the stylish-haskell version
- Code builds on Linux, MacOS and Windows for ghc-9.6 and ghc-9.12
Self-reviewed the diff

Note on CI

If your PR is from a fork, the necessary CI jobs won't trigger automatically for security reasons.
You will need to get someone with write privileges. Please contact IOG node developers to do this
for you.

lehins

Can't guarantee that my suggestions will compile, but at least they should give you enough info about those new predicate failures.

cardano-node/src/Cardano/Node/Tracing/Era/Shelley.hs

cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs

cardano-node/src/Cardano/Node/Tracing/Era/Shelley.hs

cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs

cardano-node/src/Cardano/Node/Configuration/POM.hs

bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/SizedMetadata.hs

bench/tx-generator/src/Cardano/TxGenerator/ProtocolParameters.hs

bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs

ana-pantilie · 2025-10-10T15:02:40Z

cardano-node/src/Cardano/Node/Tracing/Render.hs

      Api.AlonzoEraOnwardsBabbage -> renderAlonzoPlutusPurpose
      Api.AlonzoEraOnwardsConway -> renderConwayPlutusPurpose
+      -- TODO: fix
+      Api.AlonzoEraOnwardsDijkstra -> undefined


This needs to be addressed.

Still an undefined in the code

ana-pantilie · 2025-10-10T15:05:10Z

cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs

             ]
  forMachine _dtal (TraceLocalRootWaiting d dt) =
    mconcat [ "kind" .= String "LocalRootWaiting"
+             -- TODO: `domainAddress` -> `accessPoint`


Does this need to be addressed in this PR? Should we open a separate issue?

ana-pantilie · 2025-10-10T15:14:33Z

.../cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction/RegisterDeregisterStakeAddress.hs

-      (M.notMember stakeKeyHash . L.scDeposits)
+      (\accountsStates -> isJust $ do
+        _state <- M.lookup stakeKeyHash accountsStates
+        pure () -- TODO: should we check for balance?


Same as above.

To be addressed after fixing testnet.

ana-pantilie · 2025-10-10T15:14:45Z

.../cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction/RegisterDeregisterStakeAddress.hs

+        _state <- M.lookup stakeKeyHash accountsStates
+        pure () -- TODO: should we check for balance?
+        )
+      -- (M.notMember stakeKeyHash . L.scDeposits)


Why is this commented out instead of removed?

this is the previous implementation, to be removed once we fix the testnet tests.

ana-pantilie · 2025-10-10T15:15:11Z

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/P2PTopology.hs

 import qualified Hedgehog as H
 import qualified Hedgehog.Extras as H

+-- TODO we're not supporting non-p2p topology, does this test make any sense now?


Sounds like this needs to be addressed.

I had another look. I'll remove this test.

ana-pantilie · 2025-10-10T15:16:01Z

cardano-testnet/test/cardano-testnet-test/cardano-testnet-test.hs

+  let disabledTests = pure $ T.testGroup "tests disabled" []

-  E.withArgs args $ tests >>= T.defaultMainWithIngredients T.defaultIngredients
+  -- TODO: fix testnet tests  and reenable here


Just marking this here as the testnet tests TODO.

Yes, but it's out of scope for the node 10.6 release.

ana-pantilie · 2025-10-10T15:16:55Z

nix/haskell.nix

          ({ lib, pkgs, ... }: lib.mkIf (pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform) {
-            # Remove hsc2hs build-tool dependencies (suitable version will be available as part of the ghc derivation)
-            packages.Win32.components.library.build-tools = lib.mkForce [ ];
+            # TODO: error: The option `packages.Win32' does not exist.


Should this be addressed?

cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs

cardano-node/src/Cardano/Node/Tracing/Tracers/ChainDB.hs

Addressed in recent pushes

Jimbo4350

LGTM with respect to changes that concern my team.

Jimbo4350 · 2025-10-27T13:42:57Z

cardano-testnet/src/Testnet/Defaults.hs

-    -- Enable peer to peer discovery
-    , ("EnableP2P", Aeson.Bool False)
+    -- Enable P2P, non-P2P is gone
+    , ("EnableP2P", Aeson.Bool True)


If non-P2P is gone why bother keeping the "EnableP2P" configuration key?

Jimbo4350 · 2025-10-27T13:44:52Z

cardano-testnet/src/Testnet/Process/Cli/SPO.hs

-  (pledgerSAddr, _rewards, _poolId) <- H.headM $ mergeDelegsAndRewards delegsAndRewards
-
-  -- Pledger and owner are and can be the same
-  Text.unpack (serialiseAddress pledgerSAddr) === poolownerstakeaddr


Why has this check been removed?

Because it does not make sense. You have multiple stake addresses in the list in the arbitrary order and it fails randomly. The check that poolownerstakeaddr is in the list is already done in checkStakeKeyRegistered.

Jimbo4350 · 2025-10-27T13:47:19Z

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Node/Shutdown.hs

  H.renameFile (tempAbsPath' </> "shelley/genesis.json")        (tempAbsPath' </> defaultGenesisFilepath ShelleyEra)
  H.renameFile (tempAbsPath' </> "shelley/genesis.alonzo.json") (tempAbsPath' </> defaultGenesisFilepath AlonzoEra)
  H.renameFile (tempAbsPath' </> "shelley/genesis.conway.json") (tempAbsPath' </> defaultGenesisFilepath ConwayEra)
+  -- TODO: once 'cardano-cli latest genesis create' supports dijkstra, make this a copy instead of writing a default


@carbolymer can you turn this into an issue so we can track it.

cardano-testnet | [FR] - support dijkstra genesis in testnet setup #6350

jutaro

Thank you for this contribution. I’ve reviewed the changes related to the tracing system and have some important observations:

Incomplete removal of tracing constructors
According to the network changelog, the following were removed:

TraceLedgerPeersResult

TraceLedgerPeersFailure
However, this removal appears to be incomplete. Some references are still present in the codebase, leading to inconsistency and potential confusion during tracing. I will prepare a follow-up commit tomorrow to fully remove the remaining instances and ensure consistency.

TraceChurnMode still present
The changelog also states that:

TraceChurnMode was removed from TracePeerSelection
However, TraceChurnMode still appears in the node codebase—possibly used in a different context now. Before proceeding, I believe the network team should verify that is still required and if the codebase is fully adopted to this change. Otherwise, it may result in dead code or misleading trace output.

Additional tracing inconsistencies
While reviewing this PR, I found several smaller issues and inconsistencies in the trace definitions that should be addressed for correctness and maintainability. I will include these fixes in a follow-up commit tomorrow.

jutaro · 2025-10-24T10:09:44Z

cardano-node/src/Cardano/Node/Tracing/Render.hs

      Api.AlonzoEraOnwardsBabbage -> renderAlonzoPlutusPurpose
      Api.AlonzoEraOnwardsConway -> renderConwayPlutusPurpose
+      -- TODO: fix
+      Api.AlonzoEraOnwardsDijkstra -> undefined


Still an undefined in the code

jutaro

All issues I found have been addressed now

… node

ana-pantilie mentioned this pull request Sep 23, 2025

Node release v10.6.0 #6233

Open

8 tasks

lehins reviewed Sep 26, 2025

View reviewed changes

ana-pantilie force-pushed the ana/10.6-final-integration-mix branch 4 times, most recently from bc2e58f to 493a96d Compare September 30, 2025 11:46

crocodile-dentist force-pushed the ana/10.6-final-integration-mix branch 6 times, most recently from 847992c to c6f48e8 Compare October 2, 2025 18:19

mgmeier requested changes Oct 10, 2025

View reviewed changes

cardano-node/src/Cardano/Node/Configuration/POM.hs Show resolved Hide resolved

ana-pantilie commented Oct 10, 2025

View reviewed changes

mgmeier force-pushed the ana/10.6-final-integration-mix branch from 3736db5 to 3aae876 Compare October 13, 2025 12:24

amesgen previously requested changes Oct 14, 2025

View reviewed changes

cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs Show resolved Hide resolved

cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs Outdated Show resolved Hide resolved

johnalotoski reviewed Oct 14, 2025

View reviewed changes

cardano-node/src/Cardano/Node/Tracing/Tracers/ChainDB.hs Outdated Show resolved Hide resolved

ana-pantilie force-pushed the ana/10.6-final-integration-mix branch from 955a9c8 to ce90fec Compare October 16, 2025 13:58

carbolymer force-pushed the ana/10.6-final-integration-mix branch 2 times, most recently from 0ecd14d to 706faab Compare October 24, 2025 11:51

ana-pantilie marked this pull request as ready for review October 24, 2025 15:45

ana-pantilie requested a review from a team October 24, 2025 15:45

ana-pantilie requested review from a team as code owners October 24, 2025 15:45

Jimbo4350 approved these changes Oct 27, 2025

View reviewed changes

jutaro requested changes Oct 27, 2025

View reviewed changes

jutaro force-pushed the ana/10.6-final-integration-mix branch from ab91132 to 0eaa1e7 Compare October 28, 2025 17:31

jutaro approved these changes Oct 30, 2025

View reviewed changes

johnalotoski and others added 27 commits November 11, 2025 15:55

cardanoCfg: rm legacy network cfg w/ networking now only p2p

62df777

ci: align the static mainnet yaml GHA w/ the new cfg

35c26b3

nodeNixosSvc: add SRV record support

d80c2e2

nodeNixosSvc: add peer-snapshot to mainnet topo by default

d212573

releaseBins: rm bp cfg and adjust peerSnap topo filename

b8cec01

nodeOci: rm bp cfg, adj peerSnap topo filename, rm deprecated cfg

583ca28

nodeNixosSvc: depcreate the useNewTopology opt

9ad13e0

tracerNixosSvc: add nix support for tracer HOST:PORT netconns to/from…

19ee5ee

… node

ci: fix eval warn errors in hydra due to svc module eval

4423a68

nodeNixosSvc: add to the useNewTopology option description

38fae95

bump: iohkNix for 10.6.0 changes

43ded51

releaseBins: add per-env submit-api-config.json

66e5aa6

iohkNix: rm obsolete tracers, update peerSnaps, useLedgerAfterSlot

d6c88e7

docker: update docs for new snapshot-converter args

06ba240

Bump trace severity level for successfully loading a peer snapshot

5ab6ae8

Update cardano-api-10.19.0.0 cardano-cli-10.13.0.0

2d5fc54

Update CHaP

cd517dd

Bump cardano-tracer and trace-forward

dfd55ad

rm: redundant update cfg line

db2a298

Review changes regarding tracing

7dcf408

Review change fixes

5a4e005

diffusion: update tracers

0bc9283

cardano-testnet | Remove redundant EnableP2P node config option

9c9aa3d

Updated to ouroboros-network-0.22.4.0

325af9e

Force accumulated state of the withReplayedBlock MVar

9f22fdf

Update CHaP index-state to include the Ouroboros backports

9810d5e

Update CHaP flake input

0960b09

ana-pantilie force-pushed the ana/10.6-final-integration-mix branch from 4d56bc9 to 0960b09 Compare November 11, 2025 13:58

johnalotoski and others added 2 commits November 12, 2025 12:14

bump: iohkNix, match iohkNix cfgs for ci

02be822

Bump cardano-node version

98382f1

Release 10.6 final integration #6331

Are you sure you want to change the base?

Release 10.6 final integration #6331

Uh oh!

Conversation

ana-pantilie commented Sep 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Checklist

Note on CI

Uh oh!

lehins left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Jimbo4350 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

carbolymer Oct 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

carbolymer Oct 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

carbolymer Oct 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jutaro left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

ana-pantilie commented Sep 25, 2025 •

edited

Loading

carbolymer Oct 30, 2025 •

edited

Loading

carbolymer Oct 30, 2025 •

edited

Loading

carbolymer Oct 30, 2025 •

edited

Loading